Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jan 2012 17:26:37 +0000 (09:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jan 2012 17:26:37 +0000 (09:26 -0800)

Trivial merge